The Extremely Helpful Guide To Merge Conflicts